From a63e365e0099f365a2a4c6a8e74018630f5288e8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Sun, 2 Mar 2008 16:48:52 +0000 Subject: [PATCH] do not add @DL_LIBS@ to link line of babl. * babl.pc.in: do not add @DL_LIBS@ to link line of babl. svn path=/trunk/; revision=290 --- ChangeLog | 9 +++++++++ babl.pc.in | 3 +-- tests/Makefile.am | 23 +++++++++++------------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 83ccc97..a8d07ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-03-02 Øyvind Kolås + + * babl.pc.in: do not add @DL_LIBS@ to link line of babl. + +2008-03-02 Øyvind Kolås + + * tests/Makefile.am: applied patch from dmacks@netspace.org for + bug #519794. + 2008-03-02 Øyvind Kolås Applied patch from dmacks@netspace.org closing bug #519796 diff --git a/babl.pc.in b/babl.pc.in index 04b1fa4..76b5e69 100644 --- a/babl.pc.in +++ b/babl.pc.in @@ -7,5 +7,4 @@ Name: babl Description: Dynamic, any to any, pixel format conversion library Version: @BABL_REAL_VERSION@ Cflags: -I${includedir}/@PACKAGE_NAME@-@BABL_API_VERSION@ -Libs: -L${libdir} -l@PACKAGE_NAME@-@BABL_API_VERSION@ @DL_LIB@ @MATH_LIB@ - +Libs: -L${libdir} -l@PACKAGE_NAME@-@BABL_API_VERSION@ @MATH_LIB@ diff --git a/tests/Makefile.am b/tests/Makefile.am index 8e51457..478ac9a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,20 +10,19 @@ TESTS = \ TESTS_ENVIRONMENT = BABL_PATH=$(top_builddir)/extensions -grayscale_to_rgb_SOURCES = grayscale_to_rgb.c -rgb_to_bgr_SOURCES = rgb_to_bgr.c -srgb_to_lab_u8_SOURCES = srgb_to_lab_u8.c -rgb_to_ycbcr_SOURCES = rgb_to_ycbcr.c -babl_class_name_SOURCES = babl_class_name.c -sanity_SOURCES = sanity.c -types_SOURCES = types.c +grayscale_to_rgb_SOURCES = grayscale_to_rgb.c +rgb_to_bgr_SOURCES = rgb_to_bgr.c +srgb_to_lab_u8_SOURCES = srgb_to_lab_u8.c +rgb_to_ycbcr_SOURCES = rgb_to_ycbcr.c +babl_class_name_SOURCES = babl_class_name.c +sanity_SOURCES = sanity.c +types_SOURCES = types.c babl_fish_path_fitness_SOURCES = babl_fish_path_fitness.c -babl_fish_path_dhtml_SOURCES = babl_fish_path_dhtml.c -formats_SOURCES = formats.c -models_SOURCES = models.c +babl_fish_path_dhtml_SOURCES = babl_fish_path_dhtml.c +formats_SOURCES = formats.c +models_SOURCES = models.c - -AM_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl +AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/babl LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ $(MATH_LIB) -- 2.30.2